bitkeeper revision 1.1529 (42936afbeMakdMOVWV-TYdagR8spKg)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

diff --cc tools/python/xen/xend/XendDomain.py
index 2df4f48d9777f5649eca3aa545457de408fc7c16,2ee81c761cc6197584e517f9efbe83b4b3dbaa74..618d932b9fad64c51f275511303f8990c36b1115
--- 1/tools/python/xen/xend/XendDomain.py
--- 2/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@@ -392,11 -402,9 +402,11 @@@ class XendDomain
                  if filter(lambda (fd, event): event & select.POLLHUP, r):
                      break
  
 +            if child.wait() >> 8 == 127:
 +                lasterr = "popen %s failed" % PATH_XC_RESTORE
              if child.wait() != 0:
                  raise XendError("xc_restore failed: %s" % lasterr)
-             
+ 
              return dominfo
  
          except IOError, ex: